Pass screen to visual init (no default screen is available yet)

https://bugzilla.gnome.org/show_bug.cgi?id=700444

diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 6d17ace8c31ced0d7c4f0b1b720185e2f1b5097d..8e3ae359aa99aa61ce3c7f1c91d6328615c54abc 100644 (file)
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -206,7 +206,7 @@ _gdk_win32_display_open (const gchar *display_name)
   _gdk_screen = g_object_new (GDK_TYPE_WIN32_SCREEN, NULL);
 
   _gdk_monitor_init ();
-  _gdk_visual_init ();
+  _gdk_visual_init (_gdk_screen);
   _gdk_windowing_window_init (_gdk_screen);
   _gdk_events_init ();
   _gdk_input_init (_gdk_display);

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 9c860df1d74c7ae29db41120986a668669b1f3ec..3c2fed9149098663d19a4d39234b4ccad4bdc9a8 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -502,7 +502,7 @@ void _gdk_win32_windowing_init (void);
 void _gdk_windowing_window_init (GdkScreen *screen);
 void _gdk_root_window_size_init (void);
 void _gdk_monitor_init(void);
-void _gdk_visual_init (void);
+void _gdk_visual_init (GdkScreen *screen);
 void _gdk_dnd_init    (void);
 void _gdk_events_init (void);
 void _gdk_input_init  (GdkDisplay *display);

diff --git a/gdk/win32/gdkvisual-win32.c b/gdk/win32/gdkvisual-win32.c
index 730ff1e4d82c78b7dd61d735ab4a223528998ce7..34ee4340ed2e9cb4c9e94aeca0040d69e9e50c02 100644 (file)
--- a/gdk/win32/gdkvisual-win32.c
+++ b/gdk/win32/gdkvisual-win32.c
@@ -42,7 +42,7 @@ static gint available_depths[1];
 static GdkVisualType available_types[1];
 
 void
-_gdk_visual_init (void)
+_gdk_visual_init (GdkScreen *screen)
 {
   struct
   {
@@ -61,7 +61,7 @@ _gdk_visual_init (void)
   gint map_entries = 0;
 
   system_visual = g_object_new (GDK_TYPE_VISUAL, NULL);
-  system_visual->screen = gdk_screen_get_default();
+  system_visual->screen = screen;
 
   if (rastercaps & RC_PALETTE)
     {